Merge from emacs-24; up to r111327
authorGlenn Morris <rgm@gnu.org>
Mon, 11 Mar 2013 16:31:55 +0000 (09:31 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 11 Mar 2013 16:31:55 +0000 (09:31 -0700)
commitdde1c066956680cecf87021529e652a59f20f8d9
tree6bfadceec112e94d503a4aeb0da334ee5038037e
parent69cf0008f73a1593df8749b8c453363b402456ef
parent3d36bb01c83226ecfde7a502e1ca648f72799daf
Merge from emacs-24; up to r111327
admin/ChangeLog
admin/admin.el